fix: orgunit n+1 queries by skipping query cache #22711
Draft
+2,613,544
−2
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Morten Svanaes <msvanaes@dhis2.org>
david-mackessy
approved these changes
Jan 8, 2026
Contributor
david-mackessy
left a comment
david-mackessy
left a comment
There was a problem hiding this comment.
Always good to avoid the n+1 - nice 👍
Are we getting to a place where OrgUnits are never cached now?
Are we fully aware of any wider implications of the change? (All of these may not be relevant)
- potential downsides of the change
- some calls will be better, some will be worse
- many more DB queries for one of the most queried objects in the system
We have the ability to add tests that check the number of SQL queries executed - could it be useful here?
jbee
approved these changes
Jan 8, 2026
…_skip_orgunit_querycache
…_skip_orgunit_querycache
Signed-off-by: Morten Svanaes <msvanaes@dhis2.org>
…_skip_orgunit_querycache
Signed-off-by: Morten Svanaes <msvanaes@dhis2.org>
…_skip_orgunit_querycache
Signed-off-by: Morten Svanaes <msvanaes@dhis2.org>
Signed-off-by: Morten Svanaes <msvanaes@dhis2.org>
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request disables the query cache for
OrganisationUnitobjects to improve performance and avoid issues with N+1 queries during hydration ofOrganisationUnitobjects. The N+1 issue seen when doingOrganisationUnitqueries was caused by Hibernate when it was hydrating the objects from the query cache and needed to set the parent, which is only represented by an ID in the cache, and hence it needed to fetch the whole object from the database for each result object.